Fixes Issue #328 #329
Merged
Fixes Issue #328 #329
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Parse the keyword and text directory using utf8 encoding if PNG Chunk Type is iTXt
drewnoakes
reviewed
May 1, 2023
drewnoakes
reviewed
May 1, 2023
| @@ -248,7 +249,7 @@ private static IEnumerable<Directory> ProcessChunk(PngChunk chunk) | |||
| else if (chunkType == PngChunkType.iTXt) | |||
| { | |||
| var reader = new SequentialByteArrayReader(bytes); | |||
| var keyword = reader.GetNullTerminatedStringValue(maxLengthBytes: 79).ToString(_latin1Encoding); | |||
| var keyword = reader.GetNullTerminatedStringValue(maxLengthBytes: 79).ToString(_utf8Encoding); | |||
There was a problem hiding this comment.
There's actually now an issue slightly below here. The bytesLeft value was based on the length of the string in bytes, which for latin1 is the same as the length of the string in characters. With UTF-8 that's not the case. I'll patch this up and push to your PR.
|
I ran this against the regression test data set and it now successfully parses a bunch of previously broken values. I see no downside to this anywhere. Great stuff, thanks! |
drewnoakes
added a commit
to drewnoakes/metadata-extractor
that referenced
this pull request
May 1, 2023
This is a port of a fix from the .NET library in drewnoakes/metadata-extractor-dotnet#329 PNG chunks of type `iTXt` should have keywords and values decoded using UTF-8, not Latin1 encoding.
drewnoakes
added a commit
to drewnoakes/metadata-extractor-images
that referenced
this pull request
May 1, 2023
Thanks to @RupertAvery for reporting the issue in drewnoakes/metadata-extractor-dotnet#328 and providing a fix in drewnoakes/metadata-extractor-dotnet#329 Ported to Java in drewnoakes/metadata-extractor#611
drewnoakes
approved these changes
May 1, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #328
Parse the keyword and text directory using utf8 encoding if PNG Chunk Type is iTXt